From f85fb9e8fc1191d54bd63cff1e972eed0930d6a6 Mon Sep 17 00:00:00 2001
From: "kaf24@firebug.cl.cam.ac.uk" <kaf24@firebug.cl.cam.ac.uk>
Date: Thu, 28 Apr 2005 08:56:40 +0000
Subject: [PATCH] bitkeeper revision 1.1389 (4270a548HjJvvxATKrCShKKiLW-siw)

Cset exclude: vh249@arcadians.cl.cam.ac.uk|ChangeSet|20050427165530|30167
---
 xen/Makefile              | 9 +++++----
 xen/arch/x86/Makefile     | 2 +-
 xen/drivers/char/Makefile | 2 --
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/xen/Makefile b/xen/Makefile
index 9aee6df4c6..f4a7c6f8d9 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -47,7 +47,8 @@ clean: delete-unfresh-files
 	rm -f include/asm-*/asm-offsets.h
 	rm -f tools/figlet/*.o tools/figlet/figlet
 
-$(TARGET): delete-unfresh-files include/xen/compile.h
+$(TARGET): delete-unfresh-files
+	$(MAKE) include/xen/compile.h
 	[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
 	$(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s
 	$(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h
@@ -55,8 +56,9 @@ $(TARGET): delete-unfresh-files include/xen/compile.h
 	$(MAKE) -C drivers
 	$(MAKE) -C arch/$(TARGET_ARCH)
 
+# drivers/char/console.o may contain static banner/compile info. Blow it away.
 delete-unfresh-files:
-	rm -f include/xen/compile.h
+	rm -f include/xen/banner.h include/xen/compile.h drivers/char/console.o
 	$(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files
 
 # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
@@ -81,10 +83,9 @@ tools/figlet/figlet: tools/figlet/figlet.o
 tools/figlet/figlet.o: tools/figlet/figlet.c
 	$(HOSTCC) -o $@ -c $<
 
-.PHONY: include/xen/banner.h
 include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
 	tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
-	@cmp $@.new $@ && rm -f $@.new || mv -f $@.new $@
+	@mv -f $@.new $@
 
 include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
 	@(set -e; \
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 7f2436dc0a..42d828f7f5 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -13,7 +13,7 @@ endif
 
 default: $(TARGET)
 
-$(TARGET): $(TARGET)-syms boot/mkelf32 ../../include/xen/compile.h
+$(TARGET): $(TARGET)-syms boot/mkelf32
 	./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000
 
 $(CURDIR)/arch.o: $(OBJS)
diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index d79e545102..957a4bc5a2 100644
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -5,7 +5,5 @@ default: driver.o
 driver.o: $(OBJS)
 	$(LD) $(LDFLAGS) -r -o driver.o $(OBJS)
 
-console.o: ../../include/xen/banner.h
-
 clean:
 	rm -f *.o *~ core
-- 
2.30.2